Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 18 Feb 2010 13:20:39 +0000 (14:20 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 18 Feb 2010 13:20:39 +0000 (14:20 +0100)
commit846b829e321aabf668ef9561eaa175504918e330
tree4c35489ac19ef072791b79d69fce51a0667d3ff5
parent7cf992bbb0156ed3ba4e3ebbb4c1474ddf3e79eb
parent83eb202dd2e2d5a659d0f7a0f7f20e018b8df3c4
Merge from trunk